Remove conflict markers.

diff --git a/src/ChangeLog b/src/ChangeLog
index 7979e809a9d25b53b175beb5a2471804835559f1..5ee4f8c8de1e3a2c685486d319637ee946eeb8c9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -58,12 +58,7 @@
 
 2010-04-23  Eli Zaretskii  <eliz@gnu.org>
 
-       Support `display' text properties and overlay strings in bidi
-       buffers.
-=======
-2010-04-23  Eli Zaretskii  <eliz@gnu.org>
-
->>>>>>> MERGE-SOURCE
+       Support `display' text properties and overlay strings in bidi buffers.
        * xdisp.c (pop_it): When the stack is popped after displaying
        from a string, bidi-iterate to exit from the text portion covered
        by the `display' property or overlay.  (Bug#5988, bug#5920)